Updated with minor details