Some revision for my own use