changes in light of @vinoski comments