[REVISIONS] After revision from Prof Jeff Hora.