fixing shameful method naming