Some updates

READ COMMENTS ON DS.H!!!!