Not done! Beginning of changes for Verca.