Changes from vranki