Trying to make action flow more streamlined
Changed variable names and stuff