Improve office scenario