Fixed hw3 mess