merge from filotas and also uncommented ls