added features from Dash lesson 2