added consistent code