Updated to alma and f18