finished merging previous work:fix