Added some changes to conform better to the client