Final modifications for 1.1 version