Addding Nikolay's changes to the
repository