Addition of warnings in a better spot.