Solving the bugs, now works again