adjusted some code