More magic numbers :( - need to fix ASAP - experiments running....
Tidying