Made many cool changes