a bit of mods --kazu