Done

Fixed all bug