More work on fork