updated as suggested