combined changes from old site