merged in the changes from subler