Changes to get things workin'