Added swap timer