Makefile refactoring
Update honest scenario
Display update