Made some cool changes