Js dsc 1107

fixes most of dsc 1107