merges wsserver with flos & fixed callback