More implementation and drawing