#3  Some of the old code cleaned