Moved some spaghetti actions :)