addressing last @wasade comment and all @squirrelo