using the proper name
removed some old code