Built applied from commit 3e4a765 on branch master
added functionality back in