components better divided, base figure entering