Done with changes in design (PS and VS)