khloud added more check conditions on her methods