Added scanner design (with some bugs)