Gonna revert this for now, was causing weird issues.