Still fixing action definitions