#16 added todo for better context setting