Done, also simplified a bit.