Bug fixes
Move arrays up to one