Reviewed and cleaned up flows