rework on main activity... not done