more changes. broken