version 2 initial effort
version 2 more changes