updated checks to include all types