Made some modifications

made where extension doesn't have to be given by user