minor changes before nenad change my code ;)