Weak until support plus many minor changes
minor