Incorporated new looping and standard locations