some updates, but we're using mikes version anyhow