updated as suggested :)