Updated Code, you know the drill, does anyone read this?