Added all modifications