remake2, canvas added