Reverted back to doing everythin in PS