made some comments and moved old code to deprecated