added keyword, plus tweak with abbre expansion