Close #37, #38, #44,#45