added kirstins suggestions
changed protocol