For #28, some changes to target drawing