added triggers and removed moment