improve clickflow