Incremental poc changes