Modified Oleg's files.