Updated with Looper Fix