integrates prototype with refactored controller
fixes liveNextSession related bugs