Back to some grinding with proper capture this time