major update

added sub subject, optimization