Intermediate version with new features and bugs