changing depricated stuff