not sure if these changes are both necessary