Updated with references