0e67d13 tighten up code