Execution saving

the two commits 9c67cd8 and 1763151 from @EnoF should already be in master or? they are in develop though