Changes to match Revzens input expectations