Few more variants

Updated accorded to the comments & added few more.