Updated for newer versions of studio