Second attempt to fit the code!