Improved team example