passive ac 2 and some databace fix