changes done for nil class