updating to fix first addition flow