Merging the changes, new short version