fix some deprication and make updateable