don't do this weird decorator thing again :)