Updated with all the new things