added Alexs changes