changed name from Master to Parent and did some cleaning