Fix in progress..

Notes