Changed the general workflow