Theory update, half finished