deleted obsote function; minor changes