changes to make it work