added extend, other stuff
added extend, other stuff