Updated with McGill&Binney1990