design :fixes