Finished LooperDooper specific changes