Fixed Errors 2