fixing up methods