New Changes

Fixed Errors