Some small changes, not working yet