cleaned up code
Merge branch 'new'