Changes for parent control