Please have a look again. Feel free to make a PR against mine, if I didn't get it right.