Commit No.9 Minor tweaks before uploading