WOOOO
changed it to use logical package.