reverted controllers and changed file name

added s to calculations