Fix times
Tweak times signature