Added missing selector
removed some annoying wrappers