Refactory Continue