Add teaser + minor refactoring