Improvement #48 #47 #46