Switched to two timer method