Removed @jongstra's debug shizzle