first part of making common stateless