updated to include some eOS stuff