updated 1 weeks worth of changes