refactored
modified some values