[IMP] Finally drawing correctly with new structure