Fixed timing overflow, removed clear responsibility