working update before christmas break