added data from before
got some triggers together