Eliminated duplicate handling for now