Updated kochanparser