better locks (i hope)