Update basics and resolve focus and directionality research

Update basics and resolve focus and directionality research #270