Final version everything seems to work :)