Moving "draw" to each component