Updated with lastest about controller