ok now all the things are fixed