Merged and adding new drawing functions.