Editing aleksey's file.
Merged.