a few first changes for my usage pattern