modified Entry and Server