new design by licia, changes from server