Minor desing update