BUg fixed + set as is feature added;