Made to work with last update