Removed temp folders/files and added direct drawing.