Updated TO-DO part