addressed @gonuke's comments