Kate - final commit