added categories and imrpoved concepts