Updated to arrays