post reviewed
merged with Nico's stuff