Removed synchronized block in master because, y'know, it's utterly unnecessary