PSI a solution for issue 6, Hope to be correct