Adjustments after changing implementation.