add more drawings
refactor names