improving enabled checks