Updated & improved doc