removed Dmitriy's code