better design (temporary!)