Dynamic state psw (47/48)

Dynamic state psw