Replaced some methods with views