appeasing some of houseci's recommendations