Finalized the main components