Now draws properly