Added lock so doesn't get reinstantiated