some small changes that does not make it works already.