Updated with parsing