fixing final stuffs