added code for 6A final