Improved spiny shell behavior hackishly added.