Spike 4 modifications applied to Spike 3