Moved to single clock domain