Revert "Changed move to arraylist"

This reverts commit 75abf6418bbb6af48a82d432cb28e6057951fbde.