Added log and changes to the MainFrom