Added comments and non-blocking routing