ver2 modified