Added new example + Minor changes