added unlocking code
merged shit