final commits stuff