fixed andrew's merge