need to fix lock...