Edited for new system paths.