ake work with this pc
a nice merge
fix some of the log in process