Modified package accordig to xtraeme suggestion