Almoste ready, for revision