changes from papamoose and inntran