Worked more on advancement and donelistener