modifications to adapt to new formats