bugs and nicer structure