Additing final changes from olaptop