change to use controller & View