Implemented drawing new features