Started fixing up for Triggering