Made to work on CLIC machines
Final touches for submission