merged with alex's branch