Rasel's changes, final version