Stanislav's changes