Added the rest of the logic to veloce