Changed TODO
Fixed PIN cancel