Added non-flat option