fixed stuff removed to fix merge