More work on fold component