Fixing stuff, calls are being done, but something is wrong right now