addressed last feedback