Changes from client feedback