Outsourced some code