Made more logic redefinable.