adding better check