a few more changes before merge