Made some changes to try and get things to work...