few major changes here