Switched to isarray