Added some dudes's completion code to get it as I used to have it