fix forgotten self
moved run method over __ methods