fixed errors due to changing method signatures