Updated with more details