merging first refactor with @motasem-salem father_alive story