fixed conflicts between me and mikes work