Updated Code.. Again