done for both in a version I'll push up shortly