more changes to get things workin