Changed obsolete code