less forced code, revert basically