Implemented variation on Dima's configuration pushing