Added more drawing