Closed #3 and closed #28.