Worked on completion checking