updates to proper logic handling and routing