fix timing + add rate