fixing up some methods