removed locks. closes #1