update 2 for my personal use