Ooiion1669 r

@jamie-cyber1 please review