Updated Code #1