Making this work with the console updates