Added some suggestions