Cleaned Drawing API