address comments by xabbuh