Edit from incontrol 13