Updated maincomponent