Testing new controller features [Batch 4]