Trying a variant that was put together earlier