Was working on intervat and attack rate
Fixed errors with merge