Loop placement still not working fully, bit is a lot better