Added all current code