updated some checks