refactored with livesession comments