commented out onepk include
changed var names to lower + underscors