Okie le improvements done