Modified main class & selector.