changed to fit merged version