--Tweak to condition to check create condition