@anserran comments addressed