Sprint#6 Incorporated Review Comments and Fixed Bug