Yes, I basically just copied existing implementation. Will change that, thank you.