Worked more on system