Forking to work with my companys setup