bring functionality from 13 back to 12