final version with no extras