Some updates and simplification