Added Max's suggestions