Updated for weekend's work