Adding latest changes. Long time no see...