Minor modifies