Deleted old check in implementation