to do for final based on beta feedback