changes from alexs branch