Updated stoopid gensurf bork