(feat) added more helper functions