Updated client to work 100% with decisions