Change workflow accordingly