improved to use extended last trade