added block and adjusted upgrade system