Probably safer to put a synchronized here?