Using library function; minor updates