Added other stuff from originan hunalign