modified to accomodate changes