some proof-of-concept changes