my latest changes for now