Updated from client suggestions