few modifications to fit my wants