New Tweaks...
Many Thank's to franco-c!!!