just submitting paj's changes