More work on the standalone server