Updated.. found better solution