last commits before Friday, October 10 PM merge