added files from almeida