last commits before turning back over to seungmyung