MainActivity added and more...