little design changes from Marcel