updated with current v0.10 template