Updated with Laith files from email