added more gen2 functionality