Isolated the logic that need the id and pass it to the apply, as I showed above