updated for 12 hour demo