added goals/reformatted