removed ecs framework, little changes