add some things in their own function