That would be cleaner, implementing now.