Fixed Errors
Structure changes