crit fixes final commit