few design adaptions