Improve /activity again