More debugging
Solved magic number issue.