Updated returns. Updated formatting for waste