fixed up extend a bit