slightly more updated commenting, you can push now, Shir