Updates and new utility