Updates by Murrayserv