Made changes suggested by @NinaS