changes to fit on eclair