removed geary
working changes