More robust code but with less options