worked a bit on basePackage