3rd problem and start cleaning up