few changes to try and make it work