added support to below conditions