Updated to latest versiosn given by K on email