Made proposed changes