Change param calling, also start on butterfly outline code