making major changes to get things updated