minor desing changes