early commit 6/2 17:00