Add details
Incorporate latest changes