add some fancy stuff
pull from origin