FIX: address issues rasied in discussion