Many major changes and additions