Removed depricated parameters and added comments