DS: Corrected according to new strcuture