Changed the structure a little ...