updated based on fidelopers comments