update classes again, add a duck