Working to get timing right