Update + sync with comments in 'default controller