Loop won't work with current loop structure, removed for now, should test other changed first