Changed stuff back so it works again