pate's commit 11:16am