edward commit 20:08