Added many new stuff