Working phase 5 with comments