Modify to Two stage