Ninjaspark revisited

Snabb feedback