Fix and extends controller guide