code refine
minor change
misc change
master view change
conditionally load