got rid of deprecated functions