keep some additional code commented out for now
added params