Added methods to controller & View