refactor caps kicking