Changed stuff from Thur