reverting non-descript and merging new changes