I agree with Andres suggestion. It is cleaner and also captures all the capability I want