eliminated the use of deprecated functions