updated several new versions for odd cases