Added condition for every function