optimizing commit 481aaea
optimizing changes from commit 481aaea