Incorporating jess' ultra code

hoping this works