Moved to new entity draw code