some little design changes