Fixed Errors 50%