Partial submission of 3.3 version [PKumar]