Edited Conventies

-Edited Conventies