some more adhoc changes