Removed boxes
Merge branch 'David'