Log added + Hanging bug fixed