organized a bit better