Improved code structure and behavior for changes/positions, (in addition, resolved issue #54)