Added awesome features
Made some more awesome