Small desing update