Cleaned up Vidi