minimal desing changes