Dev code for Ivan