refactored and changed title