continued work on version 2