Better handling of IR