Better #49
#17, #34, #24