Back to using real server and added last command status