Childhood andy dev

merge with the official update