changes made, and I think this will end up going wrong

I hope we will see something proper here.