added Stevo's changes