Changes made per Vix-233