Finalized 08.01.d , needs testing