start work on removing need for fold-arm