Only small changes, doesn't currently work