updated formatting and up to 2.5