Test1

Changes for some configurations
isn't this too much?