moved things around and now they actually work