refactored completed out.. it still not working properly :)