Added some shit and made it simplier