condition check improvised!