buncha hacks to try to get this to compile again