Updated to sync with my repo for goghvmu