Modified startup to include custom delegate.