adapt 4.1 changes