Fixing models so they actually work :)