Yes, I will add this logic to the copyintercept routine provided once we get the implementation suitable.