more changing to try and get this to work