little changes to test it all