FINALLY: Main Street and major upgrade!