added code for 6.1 and 6.2