Done, also tackled @mrvisser comment just above