Ok refactored: 3debed5 and 879a73b