finishing the previous halfassed commit