Slightly improved Visuals / Testing DW