Just needs tweeks