Update from vhf's repo