Fixed the problem with arity and everything else