added arrays
fixed merge conflict