more updates and rework