mod. slightly modifications
mod. disable drip
mod. lots of changes