Trying Bug Fix Array adapter
Almost ready