last changes on design i think..