Adding functionality that seems needed.