Looks good, if it's working OK + fully switched over we can remove these two comments