More updates to duckpan new
thanks to @mwmiller for the feedback