small changes to make it work right