Cleaned up falling spike code