Commented out table locking for now, fixed clock