final (hopefully) changes