Incorporated all of Eric's shit