Adjusted some values to be more general