Track issues 25-28