Adding new version with triggers corrected.