fixed some merge issues, added back a deleted method.