Removed massive padding
Merge branch 'james'