Refactor again.. no fwks..