[UPDATE] suggested fixes