Remove extra if checks, & originalExplosion
Merge branch 'feature/FixAPI' into patch-1