Adding speed and spike intensity. Better model