slightly better design.bashing head against wall.