minor changes... but could cause conflict