final commit for comments <3 armen