Updated modules trying to improve timing