Fixed dependency
Commented out hack which reduced the number of angles to 8. We're back to 16