organized a bit more