Modified according to suggestion