Updated formatter and controller