major changes fixed