major effing updates