Can't really tell what has changed here - maybe making it singleton safe?