More updates from client suggestions