Update for usage with modal