Updated with lost stuff