Tiny update, made synchronous