Intial draft of 5.8 fixed made