moved stuff from view system