Rewrite.. do it better