Updated Current Code