merged back in changes from @davclaus