Added some suffixes and changed formatting