added conditions for some executions, timesaving yeha