fix up things :)
better