New build which closes #1, #2, #3 and #4