Small modifications. Now little bit faster.