This we should get rid of soon, but I don't do it now.. (just thinking aloud now)