minor design changes
minor changes