Updated conventions again