started overhauling methods