update gems and added and + or operations to base context