Updated and checked versions