changes made from live build review