Completed most of 3.3 version [PKumar]