Controller updates #2