Fixed Merge Errors
Design Fix