Added during loops + fixes