Week12-making improvements