Add @ahmadia suggestions