Updated for client version 3.13