Improve server and ammend requirements