More usefull structure changes;