added alexis fixes