Removed class and replaced with a onliner with a proc