version update + nicer code