Changed: slight refactoring
Changed: slight refactoring part II