little changes to make it work on eddie