Minor desing change