Updated with more deatils