Adding to the actions and elements
fixing merge conflicts with pull