Addressing @teravest's comments