Removed fade + more location