more updates but  still need to run tests..