made changes, tyring to fix merge issue