Removed massive padding
Merge branch 'james' into test