Large update of all work done in past few months