Fixing to take packages

imported from another working project