Code cleanup
Different function for speed
Merge branch 'testing'