Hardening. Should be ready for submit