main updated to remove extras