Changes, seems to work much better now