Updated Board and main