Live preview added but need to test