keep at complete revamping of code