removed capitalization and re-ordered