included Stevo's changes