Removed 'some' hacks :p