Removed comments, and added support to send N images back to the client