More function usage - based of OK03 - fixed #1