More work on fixing Loop using itself