general changes

general changes