Updated the NOTES & PLAN