removed locking from datahandler