hopefully last round of changes