Updated with arrays