first changes to get it to work for a bit