Added many nice things