perf optimization + definitions
1.0.4