altered the structure a bit