added unlocking n stuff